Merged.

diff --cc tools/libxc/xc_linux_build.c
index 6a7a0369fcb521135779fdfaf0f24c1351add6f8,8d119717f255ca911985cc787bb53442178979bd..ed1cafc71b0cf45f3d2e2fa8b6c41d476d1e0fd1
--- 1/tools/libxc/xc_linux_build.c
--- 2/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@@ -693,11 -693,11 +693,12 @@@ static int setup_guest(int xc_handle
          start_info->mod_start    = vinitrd_start;
          start_info->mod_len      = initrd_len;
      }
 -    if ( cmdline != NULL )
 +    if (cmdline != NULL) {
+     {
          strncpy((char *)start_info->cmd_line, cmdline, MAX_GUEST_CMDLINE);
          start_info->cmd_line[MAX_GUEST_CMDLINE-1] = '\0';
 -    }
 +    } else
 +        start_info->cmd_line[0] = '\0';
      munmap(start_info, PAGE_SIZE);
  
      /* shared_info page starts its life empty. */